OCPBUGS-86849: Populate status label selector for scale subresource by RadekManak · Pull Request #1504 · openshift/machine-api-operator

RadekManak · 2026-06-02T09:08:44Z

Backport of #1490 to release-4.20.

Fixes OCPBUGS-86849 (clone of OCPBUGS-82584 for release-4.20).

Populates status.labelSelector on MachineSet from spec.selector so the /scale subresource exposes a valid selector string, enabling HPA and external autoscalers to work correctly.

openshift-ci · 2026-06-02T09:08:48Z

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

openshift-ci-robot · 2026-06-02T09:08:52Z

@RadekManak: This pull request references Jira Issue OCPBUGS-86849, which is invalid:

expected dependent Jira Issue OCPBUGS-86493 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is POST instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

Backport of #1490 to release-4.20.

Fixes OCPBUGS-86849 (clone of OCPBUGS-82584 for release-4.20).

Populates status.labelSelector on MachineSet from spec.selector so the /scale subresource exposes a valid selector string, enabling HPA and external autoscalers to work correctly.

Depends on openshift/api#2866 (uses local replace for openshift/api until that PR merges).

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

coderabbitai · 2026-06-02T09:08:54Z

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository: openshift/coderabbit/.coderabbit.yaml

Review profile: CHILL

Plan: Enterprise

Run ID: be8d1e72-2cc4-4842-b8a4-212b13bd3bb1

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

🔍 Trigger review

✨ Finishing Touches

🧪 Generate unit tests (beta)

Create PR with unit tests

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

openshift-ci-robot · 2026-06-05T15:23:21Z

@RadekManak: This pull request references Jira Issue OCPBUGS-86849, which is valid.

7 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.20.z) matches configured target version for branch (4.20.z)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
release note text is set and does not match the template
dependent bug Jira Issue OCPBUGS-86493 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
dependent Jira Issue OCPBUGS-86493 targets the "4.21.z" version, which is one of the valid target versions: 4.21.0, 4.21.z
bug has dependents

Details

In response to this:

Backport of #1490 to release-4.20.

Fixes OCPBUGS-86849 (clone of OCPBUGS-82584 for release-4.20).

Populates status.labelSelector on MachineSet from spec.selector so the /scale subresource exposes a valid selector string, enabling HPA and external autoscalers to work correctly.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

Vendors openshift/api from cherry-pick-2807-to-release-4.20 branch (local replace) which adds LabelSelector to MachineSet status for the scale subresource (OCPBUGS-86849).

Cherry-pick of openshift#1490 to release-4.20. Fixes OCPBUGS-86849.

RadekManak · 2026-06-08T11:01:19Z

/retest

RadekManak · 2026-06-08T15:08:38Z

/retest

openshift-ci · 2026-06-08T18:50:19Z

@RadekManak: all tests passed!

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

RadekManak · 2026-06-09T06:32:28Z

/label backport-risk-assesed
/verified by https://github.com/openshift/cluster-api-actuator-pkg/pull/480/checks?check_run_id=79037339010

openshift-ci · 2026-06-09T06:32:30Z

@RadekManak: The label(s) /label backport-risk-assesed cannot be applied. These labels are supported: acknowledge-critical-fixes-only, platform/aws, platform/azure, platform/baremetal, platform/google, platform/libvirt, platform/openstack, ga, tide/merge-method-merge, tide/merge-method-rebase, tide/merge-method-squash, px-approved, docs-approved, qe-approved, ux-approved, no-qe, rebase/manual, cluster-config-api-changed, run-integration-tests, verified, ready-for-human-review, approved, backport-risk-assessed, bugzilla/valid-bug, cherry-pick-approved, jira/skip-dependent-bug-check, jira/valid-bug, ok-to-test, stability-fix-approved, staff-eng-approved. Is this label configured under labels -> additional_labels or labels -> restricted_labels in plugin.yaml?

Details

In response to this:

/label backport-risk-assesed
/verified by https://github.com/openshift/cluster-api-actuator-pkg/pull/480/checks?check_run_id=79037339010

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

openshift-ci-robot · 2026-06-09T06:32:41Z

@RadekManak: This PR has been marked as verified by https://github.com/openshift/cluster-api-actuator-pkg/pull/480/checks?check_run_id=79037339010.

Details

In response to this:

/label backport-risk-assesed
/verified by https://github.com/openshift/cluster-api-actuator-pkg/pull/480/checks?check_run_id=79037339010

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

RadekManak · 2026-06-09T06:32:48Z

/label backport-risk-assessed

damdo

/approve
/lgtm

openshift-ci · 2026-06-09T07:01:52Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: damdo

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [damdo]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

openshift-ci-robot · 2026-06-09T07:06:34Z

@RadekManak: Jira Issue OCPBUGS-86849: Some pull requests linked via external trackers have merged:

The following pull request, linked via external tracker, has not merged:

openshift/cluster-api-actuator-pkg#480 is open

All associated pull requests must be merged or unlinked from the Jira bug in order for it to move to the next state. Once unlinked, request a bug refresh with /jira refresh.

Jira Issue OCPBUGS-86849 has not been moved to the MODIFIED state.

This PR is marked as verified. If the remaining PRs listed above are marked as verified before merging, the issue will automatically be moved to VERIFIED after all of the changes from the PRs are available in an accepted nightly payload.

Details

In response to this:

Backport of #1490 to release-4.20.

Fixes OCPBUGS-86849 (clone of OCPBUGS-82584 for release-4.20).

Populates status.labelSelector on MachineSet from spec.selector so the /scale subresource exposes a valid selector string, enabling HPA and external autoscalers to work correctly.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

openshift-merge-robot · 2026-06-09T23:56:20Z

Fix included in release 4.20.0-0.nightly-2026-06-09-143002

openshift-ci Bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 2, 2026

RadekManak mentioned this pull request Jun 2, 2026

OCPBUGS-86849: test MachineSet scale selector for HPA openshift/cluster-api-actuator-pkg#480

Merged

RadekManak force-pushed the cherry-pick-1490-to-release-4.20 branch from 6603289 to 02d9b26 Compare June 5, 2026 12:34

RadekManak marked this pull request as ready for review June 5, 2026 15:23

openshift-ci Bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 5, 2026

openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Jun 5, 2026

openshift-ci Bot requested review from elmiko and nrb June 5, 2026 15:23

RadekManak added 2 commits June 8, 2026 10:56

Vendor openshift/api with labelSelector fix

63e6c84

Vendors openshift/api from cherry-pick-2807-to-release-4.20 branch (local replace) which adds LabelSelector to MachineSet status for the scale subresource (OCPBUGS-86849).

machineset: populate status.labelSelector for scale subresource

fb11ddd

Cherry-pick of openshift#1490 to release-4.20. Fixes OCPBUGS-86849.

RadekManak force-pushed the cherry-pick-1490-to-release-4.20 branch from 02d9b26 to fb11ddd Compare June 8, 2026 08:56

openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Jun 9, 2026

openshift-ci Bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Jun 9, 2026

damdo reviewed Jun 9, 2026

View reviewed changes

openshift-ci Bot assigned damdo Jun 9, 2026

openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jun 9, 2026

openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 9, 2026

openshift-merge-bot Bot merged commit de0171b into openshift:release-4.20 Jun 9, 2026
16 checks passed

Conversation

RadekManak commented Jun 2, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci Bot commented Jun 2, 2026

Uh oh!

openshift-ci-robot commented Jun 2, 2026

Uh oh!

coderabbitai Bot commented Jun 2, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Review skipped

Uh oh!

openshift-ci-robot commented Jun 5, 2026

Uh oh!

RadekManak commented Jun 8, 2026

Uh oh!

RadekManak commented Jun 8, 2026

Uh oh!

openshift-ci Bot commented Jun 8, 2026

Uh oh!

RadekManak commented Jun 9, 2026

Uh oh!

openshift-ci Bot commented Jun 9, 2026

Uh oh!

openshift-ci-robot commented Jun 9, 2026

Uh oh!

RadekManak commented Jun 9, 2026

Uh oh!

damdo left a comment

Choose a reason for hiding this comment

Uh oh!

openshift-ci Bot commented Jun 9, 2026

Uh oh!

Uh oh!

openshift-ci-robot commented Jun 9, 2026

Uh oh!

openshift-merge-robot commented Jun 9, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

RadekManak commented Jun 2, 2026 •

edited

Loading

coderabbitai Bot commented Jun 2, 2026 •

edited

Loading